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

Conflicts:
	trunk/src/base/gui/MenuWidget.cpp
	trunk/src/base/gui/SearchBarWidget.cpp
	trunk/src/base/xsl.xsl
	trunk/src/plugins/xdxf/src/xdxfplugin.h

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

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

diff --cc trunk/src/base/gui/MenuWidget.cpp
index 7dd6475,afd234c..c79f0ac
--- 1/trunk/src/base/gui/MenuWidget.cpp
--- 2/trunk/src/base/gui/MenuWidget.cpp
+++ b/trunk/src/base/gui/MenuWidget.cpp
@@@ -28,8 -28,8 +28,10 @@@
  MenuWidget::MenuWidget(QWidget *parent) :
      QWidgetAction(parent) {
  
 +    //creating custom tab widget, and sets style sheet to have centered tabs
 +    tabWidget = new MenuTabWidget(this);
+     //creates custom tab widget, and sets style sheet to have centered tabs
+     tabWidget = new MenuTabWidget();
      tabWidget->setStyleSheet("QTabWidget::tab-bar {alignment: center;}");
  
  }

diff --cc trunk/src/base/gui/SearchBarWidget.cpp
index cc4e6c8,eb30983..43519dc
--- 1/trunk/src/base/gui/SearchBarWidget.cpp
--- 2/trunk/src/base/gui/SearchBarWidget.cpp
+++ b/trunk/src/base/gui/SearchBarWidget.cpp
@@@ -185,9 -185,9 +185,8 @@@ void SearchBarWidget::initializeUI() 
                  fullScreenToolButton->sizeHint().height()*2);
      #endif*/
  
--
-     searchingProgressBar = new QProgressBar(this);
-     //progress bar have minimum and maximum values set to 0, which will effect
+     searchingProgressBar = new QProgressBar();
+     //progress bar has 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/TranslationWidget.cpp
index f62ffda,1480f91..cacfebf
--- 1/trunk/src/base/gui/TranslationWidget.cpp
--- 2/trunk/src/base/gui/TranslationWidget.cpp
+++ b/trunk/src/base/gui/TranslationWidget.cpp
@@@ -77,15 -80,14 +82,15 @@@ void TranslationWidget::show(QStringLis
  
      trans=tr("<?xml version=\"1.0\" encoding=\"UTF-8\"?>") + tr("\n <ar>") + trans + tr("\n </ar>");
      trans=XslConversion(trans);
 +
      textEdit->insertHtml(trans);
 - //   textEdit->setPlainText(trans);
  
 -    textEdit->repaint(this->rect());
 +//  textEdit->setPlainText(trans);
  
 +    textEdit->repaint(this->rect());
      update(this->rect());
  
-     emit updateSize();
+     Q_EMIT updateSize();
  }
  
  QString TranslationWidget::XslConversion(QString translation)

diff --cc trunk/src/base/xsl.xsl
index e966813,c6db7fd..a3dd6e1
--- 1/trunk/src/base/xsl.xsl
--- 2/trunk/src/base/xsl.xsl
+++ b/trunk/src/base/xsl.xsl
@@@ -14,21 -17,15 +17,32 @@@
  </xsl:template> 
  
  <xsl:template match="info">
++<<<<<<< HEAD
 +      <!-- <xsl:variable name="path" select="info/@path"/>-->
 +      <tr bgcolor="#99FF99">
 +              <th>            
 +              <xsl:if test="@bookmark = 'true'">
 +                      <img src="mydata://image.png"/>   
 +                      </xsl:if>
 +              <xsl:value-of select="."/> <!-- <img src="{$path}"/> -->
 +              </th>
++=======
+       <tr>
+       <th class="info"><xsl:value-of select="."/></th>
++>>>>>>> 3e7118bfec64f44b11205ca836cb1a82c725d123
        </tr>
  </xsl:template>
  
  <xsl:template match="key">
++<<<<<<< HEAD
 +      <tr bgcolor="#99CCFF">
 +      <th><xsl:value-of select="."/></th>                     
 +      </tr>
++=======
+       <tr>
+       <th class="key"><xsl:value-of select="."/></th>         
+         </tr>
++>>>>>>> 3e7118bfec64f44b11205ca836cb1a82c725d123
  </xsl:template> 
  
  <xsl:template match="t">

diff --cc trunk/src/includes/settings.h
Simple merge

diff --cc trunk/src/plugins/xdxf/src/XdxfDictDialog.h
index ac83859,73f882c..e0b2ba8
--- 1/trunk/src/plugins/xdxf/src/XdxfDictDialog.h
--- 2/trunk/src/plugins/xdxf/src/XdxfDictDialog.h
+++ b/trunk/src/plugins/xdxf/src/XdxfDictDialog.h
@@@ -36,9 -36,10 +36,9 @@@ class XdxfDictDialog : public DictDialo
      Q_OBJECT
  public:
      explicit XdxfDictDialog(XdxfPlugin* plugin, QObject *parent = 0);
 -
      /*!
        Shows add new xdxf dictionary dialog and returns settings of new dict
-       \param parent parent widget on which will be displayed dialog
+       \param parent parent widget on which dialog will be displayed
        */
      Settings* addNewDictionary(QWidget *parent);
  

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

diff --cc trunk/src/plugins/xdxf/src/xdxfplugin.h
index e413e2c,bbd6cb5..f844971
--- 1/trunk/src/plugins/xdxf/src/xdxfplugin.h
--- 2/trunk/src/plugins/xdxf/src/xdxfplugin.h
+++ b/trunk/src/plugins/xdxf/src/xdxfplugin.h
@@@ -158,10 -152,12 +158,9 @@@ private
      QSqlDatabase db;
      QString db_name;
  
-     //! number of words in dicrionary
+     //! number of words in dictionary
      long _wordsCount;
  
- 
 -    //! scans dictionary file to get information about it
 -    void getDictionaryInfo();
 -
      volatile bool stopped;
      Settings *_settings;
      XdxfDictDialog* _dictDialog;