Merge branch 'master' into google

Conflicts:
	trunk/src/includes/CommonDictInterface.h
	trunk/src/plugins/google/src/GoogleSettingsDialog.cpp
	trunk/src/plugins/google/src/GoogleSettingsDialog.h

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

diff --cc trunk/src/includes/CommonDictInterface.h
index 2cd84f8,48dc535..e820e48
--- 1/trunk/src/includes/CommonDictInterface.h
--- 2/trunk/src/includes/CommonDictInterface.h
+++ b/trunk/src/includes/CommonDictInterface.h
@@@ -89,7 -89,13 +89,13 @@@ class CommonDictInterface : public QObj
      //! returns plugin icon
      virtual QIcon* icon() = 0;
  
-     virtual Translation* getTranslationFor(QString) {return 0;}
+     //! returns empty translation object (to be fetch later) for given key
 -    virtual Translation* getTranslationFor(QString key) {return 0;}
++    virtual Translation* getTranslationFor(QString ) {return 0;}
+ 
+     /*! plugin should delete any files (eg. cache) that has created and be ready
+         to be deleted
+         */
+     virtual void clean() {};
  
   public Q_SLOTS:
      /*! performs search in dictionary

diff --cc trunk/src/plugins/google/src/GoogleSettingsDialog.cpp
index f35f017,555a143..c4fc2b7
--- 1/trunk/src/plugins/google/src/GoogleSettingsDialog.cpp
--- 2/trunk/src/plugins/google/src/GoogleSettingsDialog.cpp
+++ b/trunk/src/plugins/google/src/GoogleSettingsDialog.cpp
@@@ -26,52 -26,64 +26,87 @@@
  #include "GoogleSettingsDialog.h"
  #include <QDebug>
  
++<<<<<<< HEAD
 +GoogleSettingsDialog::GoogleSettingsDialog(QWidget *parent,Settings *pluginSettings) :
 +    QDialog(parent)
 +{
++=======
+ GoogleSettingsDialog::GoogleSettingsDialog(QWidget *parent,
+                                            QString langTo,
+                                            QString langFrom,
+                                            QString acceptButtonLabel) :
+     QDialog(parent) {
++>>>>>>> master
      QMap<QString, QString> languages;
      languages=GooglePlugin::initLanguages();
  
      int actualLangTo=1;
      int actualLangFrom=1;
  
 -    if(langTo=="")
 -        langTo="pl";
 -    if(langFrom=="")
 -        langFrom="en";
 -
 -    _langTo=languages.key(langTo);
 -    _langFrom=languages.key(langFrom);
 -
 +    if(pluginSettings==0) {
 +        _langTo=languages.key("pl");
 +        _langFrom=languages.key("en");
 +    }
 +    else {
 +        _langTo=languages.key(pluginSettings->value("lang_to"));
 +        _langFrom=languages.key(pluginSettings->value("lang_from"));
 +    }
  
      #ifdef Q_WS_MAEMO_5
-         changeLangButton=new QPushButton(QIcon::fromTheme("general_refresh"),tr(""));
+         changeLangButton=new
+                          QPushButton(
+                                  QIcon::fromTheme("general_refresh"),tr(""));
      #else
-         changeLangButton=new QPushButton(QIcon::fromTheme("object-flip-vertical"),tr(""));
+         changeLangButton=new QPushButton(
+                 QIcon::fromTheme("object-flip-vertical"),tr(""));
      #endif
 +
      langFromLabel = new QLabel("From:");
      langToLabel = new QLabel(" To: ");
      connectInfoLabel = new QLabel(tr("Google plugin make use of internet "
                                       "conection, so it may cost You."));
++<<<<<<< HEAD
 +    infoLabel = new QLabel(tr("Plugin:GoogleTranslator \n From: %1 \n To: %2").arg(
 +                            _langFrom,_langTo));
 +    verticalLayout = new QVBoxLayout(this);
 +    langLayout = new QVBoxLayout(this);
 +    langFromLayout = new QHBoxLayout(this);
 +    langToLayout = new QHBoxLayout(this);
 +    changelangLayout = new QHBoxLayout(this);
 +    langFromComboBox = new QComboBox(this);
 +    langToComboBox = new QComboBox(this);
 +    saveButton = new QPushButton(tr("Save settings"),this);
 +
 +    connectInfoLabel->setWordWrap(true);
 +
++=======
+     connectInfoLabel->setWordWrap(true);
+ 
+ 
+     setWindowTitle(tr("Google Settings"));
+ 
+     verticalLayout = new QVBoxLayout;
+     langLayout = new QVBoxLayout;
+     langFromLayout = new QHBoxLayout;
+     langToLayout = new QHBoxLayout;
+     changelangLayout = new QHBoxLayout;
+ 
+     setLayout(verticalLayout);
+ 
+     infoLabel = new QLabel;
+     infoLabel->setText(tr("Plugin:GoogleTranslator \n")+
+                    tr("From: ") + languages.key(langFrom) + "\n" +
+                    tr("To: ") + languages.key(langTo));
+     verticalLayout->addWidget(infoLabel);
+ 
+     langFromComboBox = new QComboBox;
+     langToComboBox = new QComboBox;
++>>>>>>> master
      int i=0;
      foreach(QString langs,languages.keys()){
 -        if(langs==languages.key(langTo))
 +        if(langs==_langTo)
              actualLangTo=i;
 -        if(langs==languages.key(langFrom))
 +        if(langs==_langFrom)
              actualLangFrom=i;
          langToComboBox->addItem(langs);
          langFromComboBox->addItem(langs);
@@@ -93,6 -100,12 +128,15 @@@
      changelangLayout->addLayout(langLayout);
      changelangLayout->addWidget(changeLangButton);
      verticalLayout->addLayout(changelangLayout);
++<<<<<<< HEAD
++=======
+ 
+ 
+     langToComboBox->setCurrentIndex(actualLangTo);
+     langFromComboBox->setCurrentIndex(actualLangFrom);
+ 
+     saveButton = new QPushButton(acceptButtonLabel);
++>>>>>>> master
      verticalLayout->addWidget(saveButton);
  
      setModal(true);
@@@ -128,24 -147,34 +176,50 @@@ QString GoogleSettingsDialog::langTo() 
      return _langTo;
  }
  
++<<<<<<< HEAD
 +Settings* GoogleSettingsDialog::getSettings(QWidget *parent,Settings *pluginSettings) {
 +    GoogleSettingsDialog settingsDialog(parent,pluginSettings);
++=======
+ Settings* GoogleSettingsDialog::getSettings(QWidget *parent,
+                                             QString langTo,
+                                             QString langFrom,
+                                             QString acceptButtonLabel) {
+     GoogleSettingsDialog settingsDialog(parent,
+                                         langTo,
+                                         langFrom,
+                                         acceptButtonLabel);
++>>>>>>> master
      QMap<QString, QString> languages;
      languages=GooglePlugin::initLanguages();
      if(settingsDialog.exec()==QDialog::Accepted) {
          Settings *settings = new Settings();
++<<<<<<< HEAD
 +        settings->setValue("lang_to",languages.value(settingsDialog.langTo()));
 +        settings->setValue("lang_from",languages.value(settingsDialog.langFrom()));
 +        settings->setValue("connection_accept","true");
 +        settings->setValue("type","google");
++=======
+         settings->setValue("langTo",languages.value(settingsDialog.langTo()));
+         settings->setValue("langFrom",
+                            languages.value(settingsDialog.langFrom()));
+         settings->setValue("connectionAccept","true");
++>>>>>>> master
          return settings;
      }
      return 0;
  }
  
- void GoogleSettingsDialog::changeSettings(GooglePlugin* plugin, QWidget *parent) {
+ void GoogleSettingsDialog::changeSettings(GooglePlugin* plugin,
+                                           QWidget *parent) {
      Settings *settings = new Settings();
++<<<<<<< HEAD
 +    settings=getSettings(parent,plugin->settings());
++=======
+     settings=getSettings(parent,
+                          plugin->settings()->value("langTo"),
+                          plugin->settings()->value("langFrom"),
+                          tr("Save changes"));
++>>>>>>> master
      if(settings)
          plugin->setSettings(settings);
  }

diff --cc trunk/src/plugins/google/src/GoogleSettingsDialog.h
index 511de18,866bda2..362ba54
--- 1/trunk/src/plugins/google/src/GoogleSettingsDialog.h
--- 2/trunk/src/plugins/google/src/GoogleSettingsDialog.h
+++ b/trunk/src/plugins/google/src/GoogleSettingsDialog.h
@@@ -38,7 -38,10 +38,14 @@@ class GoogleSettingsDialog : public QDi
  {
      Q_OBJECT
  public:
++<<<<<<< HEAD
 +    explicit GoogleSettingsDialog(QWidget *parent = 0,Settings *pluginSettings=0);
++=======
+     explicit GoogleSettingsDialog(QWidget *parent = 0,
+                                   QString langTo ="",
+                                   QString langFrom ="",
+                                   QString acceptButtonLabel = tr("Add"));
++>>>>>>> master
  
      /*!
          \param parent parent widget on which will be displayed dialog
@@@ -46,7 -49,10 +53,14 @@@
          \param langFrom language witch is display in the comboBox as a startup item
          \returns function return settings to GooglePlugin
      */
++<<<<<<< HEAD
 +    static Settings* getSettings(QWidget *parent,Settings *pluginSettings=0);
++=======
+     static Settings* getSettings(QWidget *parent,
+                                  QString langTo ="",
+                                  QString langFrom ="",
+                                  QString acceptButtonLabel = tr("Add"));
++>>>>>>> master
  
      /*!
          function set a new settings in plugin;

diff --cc trunk/src/plugins/xdxf/src/xdxfplugin.cpp
Simple merge