Merge branch 'master' into google

Conflicts:
	trunk/src/base/backbone/backbone.cpp
	trunk/src/base/gui/DictManagerWidget.cpp
	trunk/src/base/gui/SearchBarWidget.cpp

diff --cc trunk/src/base/backbone/backbone.cpp
Simple merge

diff --cc trunk/src/base/backbone/backbone.h
index 17f4a69,6ca7ff2..d19bc70
--- 1/trunk/src/base/backbone/backbone.h
--- 2/trunk/src/base/backbone/backbone.h
+++ b/trunk/src/base/backbone/backbone.h
@@@ -208,9 -208,9 +208,9 @@@ public Q_SLOTS
  
  
  
 -    /*! Remove all bookmarks
 +    /*! Removes all bookmarks
        */
-     void removeAllBookmark(){
+     void removeAllBookmarks(){
          _bookmarks.clear();
      }
  

diff --cc trunk/src/base/gui/BookmarksWidget.h
Simple merge

diff --cc trunk/src/base/gui/DictManagerWidget.cpp
index 22fe241,b34f7c1..157aa2f
--- 1/trunk/src/base/gui/DictManagerWidget.cpp
--- 2/trunk/src/base/gui/DictManagerWidget.cpp
+++ b/trunk/src/base/gui/DictManagerWidget.cpp
@@@ -117,18 -133,32 +133,31 @@@ void DictManagerWidget::showEvent(QShow
      QWidget::showEvent(e);
  }
  
- void DictManagerWidget::hideEvent(QHideEvent *e)
- {
-     QList<CommonDictInterface*> checkedDicts;
+ void DictManagerWidget::saveChanges() {
+ 
+     #ifndef Q_WS_MAEMO_5
+     if(_save) {
+     #else
+     if(_changed &&
+             QMessageBox::question(this, "Save", "Do you want to save changes?",
+             QMessageBox::Save, QMessageBox::Cancel) == QMessageBox::Save) {
+     #endif
+         QList<CommonDictInterface*> checkedDicts;
  
-     for(int i=0; i<dictListWidget->count(); i++) {
-         QListWidgetItem* item = dictListWidget->item(i);
-         if(item->checkState() == Qt::Checked) {
-             checkedDicts.push_back(dictsHash[item]);
+         for(int i=0; i<dictListWidget->count(); i++) {
+             QListWidgetItem* item = dictListWidget->item(i);
+             if(item->checkState() == Qt::Checked) {
+                 checkedDicts.push_back(dictsHash[item]);
+             }
          }
+         emit selectedDictionaries(checkedDicts);
      }
-     Q_EMIT selectedDictionaries(checkedDicts);
 -
+     _changed = false;
+ }
  
+ void DictManagerWidget::hideEvent(QHideEvent *e)
+ {
+     saveChanges();
      QWidget::hideEvent(e);
  }
  

diff --cc trunk/src/base/gui/DictManagerWidget.h
Simple merge

diff --cc trunk/src/base/gui/MainWindow.cpp
Simple merge

diff --cc trunk/src/base/gui/MainWindow.h
index 66fb906,2a5ae66..e65769b
--- 1/trunk/src/base/gui/MainWindow.h
--- 2/trunk/src/base/gui/MainWindow.h
+++ b/trunk/src/base/gui/MainWindow.h
@@@ -191,9 -191,12 +191,12 @@@ private Q_SLOTS
      //! disabled
      void breakSearching();
  
+     //! Asks for confirmation when user click on "delete all bookmarks"
+     void removeBookmarks();
+ 
  
  protected:
 -    /*! When user wants to close application, we first sends signal to stop all
 +    /*! When user wants to close application, we first send signal to stop all
          ongoing searches.
      */
      void closeEvent(QCloseEvent *);

diff --cc trunk/src/base/gui/SearchBarWidget.cpp
index 29368e3,b9f674c..6921e26
--- 1/trunk/src/base/gui/SearchBarWidget.cpp
--- 2/trunk/src/base/gui/SearchBarWidget.cpp
+++ b/trunk/src/base/gui/SearchBarWidget.cpp
@@@ -185,8 -187,9 +187,8 @@@ void SearchBarWidget::initializeUI() 
                  fullScreenToolButton->sizeHint().height()*2);
      #endif*/
  
-     searchingProgressBar = new QProgressBar(this);
-     //progress bar has minimum and maximum values set to 0, which will effect
 -
+     searchingProgressBar = new QProgressBar();
+     //progress bar have minimum and maximum values set to 0, which will effect
      //with "I'm alive" bar
      searchingProgressBar->setMinimum(0);
      searchingProgressBar->setMaximum(0);

diff --cc trunk/src/base/gui/SettingsWidget.cpp
Simple merge

diff --cc trunk/src/base/gui/SettingsWidget.h
Simple merge

diff --cc trunk/src/base/gui/TranslationWidget.cpp
Simple merge

diff --cc trunk/src/plugins/xdxf/src/xdxfplugin.cpp
index 0cc32e7,e99f6ba..eb111dc
--- 1/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
--- 2/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
+++ b/trunk/src/plugins/xdxf/src/xdxfplugin.cpp
@@@ -360,12 -372,8 +371,8 @@@ void XdxfPlugin::getDictionaryInfo() 
  
      QString format = "png";
      QString initialPath = QDir::currentPath() + tr("/xdxf.") + format;
- //  qDebug()<<initialPath;
- //  QPixmap test(":/icons/xdxf.png");
- //  qDebug()<<QPixmap(test).save(initialPath,format.toAscii());
- //  qDebug()<<QPixmap("/home/jakub/star.jpg").save(initialPath,format.toAscii());
  
 -    _infoNote="path=\""+initialPath+"\">"+"\n" + _name + " [" + _langFrom + "-" + _langTo + "] "+ "(" + _type + ")";
 +    _infoNote="path=\""+initialPath+"\"> \n" + _name + " [" + _langFrom + "-" + _langTo + "] (" + _type + ")";
  
      dictionaryFile.close();
  }