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

Conflicts:
	data/xsl/style.css
	data/xsl/xsl.xsl
	src/mdictionary/gui/DictManagerWidget.cpp
	src/plugins/xdxf/XdxfLoadDialog.cpp
	src/plugins/xdxf/XdxfLoadDialog.h
	src/plugins/xdxf/XdxfSettingsDialog.cpp

diff --cc data/xsl/style.css
index 24db5fb,400f414..517e017
--- 1/data/xsl/style.css
--- 2/data/xsl/style.css
+++ b/data/xsl/style.css
@@@ -1,25 -1,8 +1,26 @@@
 -th.info {
 -      background-color        : #99FF99;     
++
 +div.tab {
 +       
 +       border-style            : solid;
 +       border-width            : thin;
 +       width                   : 100%
 +}
 +
 +div.info {
 +        font-weight            : bold;
 +        text-align             : center;
 +        border-style           : solid;
 +        border-width           : thin;
 +        margin                 : 2px 2px 2px 2px;                 
 +      background-color       : #99FF99;
  }
  
 -th.key {
 +div.key {
 +       font-weight             : bold;
 +       text-align              : center;
 +       border-style            : solid;
 +       border-width            : thin;
 +       margin                  : 2px 2px 2px 2px;   
         background-color        : #99CCFF; 
  }
  

diff --cc src/mdictionary/gui/DictManagerWidget.cpp
index c1f517d,00ce860..e144b7d
--- 1/src/mdictionary/gui/DictManagerWidget.cpp
--- 2/src/mdictionary/gui/DictManagerWidget.cpp
+++ b/src/mdictionary/gui/DictManagerWidget.cpp
@@@ -175,12 -176,15 +176,16 @@@ void DictManagerWidget::addNewDictButto
      #endif
  
     CommonDictInterface* selectedPlugin =
 +           DictTypeSelectDialog::addNewDict(guiInterface->getPlugins(),this);
 +   if(selectedPlugin) {
+            DictTypeSelectDialog::addNewDict(
+                    guiInterface->getPlugins(),
+                    this->parentWidget());
+ 
 -   if(selectedPlugin != NULL) {
         Settings* settings =
-                selectedPlugin->dictDialog()->addNewDictionary(this);
+                selectedPlugin->dictDialog()->addNewDictionary(this->parentWidget());
  
 -       if(settings != NULL) {
 +       if(settings) {
             CommonDictInterface* newDict = selectedPlugin->getNew(settings);
             if(newDict) {
                 delete settings;

diff --cc src/mdictionary/gui/MenuWidget.cpp
index 07b8d2e,e447d2f..be3e2af
--- 1/src/mdictionary/gui/MenuWidget.cpp
--- 2/src/mdictionary/gui/MenuWidget.cpp
+++ b/src/mdictionary/gui/MenuWidget.cpp
@@@ -58,15 -60,19 +60,19 @@@ void MenuWidget::removeSubMenu(QString 
      }
  }
  
- QWidget* MenuWidget::createWidget(QWidget *) {
+ QWidget* MenuWidget::createWidget(QWidget *parent) {
      /*When we have request to create new widget we return tabWidget.
      When the menu is closing, tabWidget will receive hideEvent which will set
 -    its parent to NULL and prevent it from delete, so we can still use this
 +    its parent to 0 (NULL) and prevent it from delete, so we can still use this
      widget*/
+     if(applicationMenu==0) {
+         applicationMenu = parent;
+         Q_EMIT setApplicationMenu(applicationMenu);
+     }
      return tabWidget;
- 
  }
  
+ 
  void MenuWidget::hideMenu() {
      tabWidget->parentWidget()->hide();
  }