Merge branch 'google'

diff --git a/data/xsl/style.css b/data/xsl/style.css
index c8490f2..400f414 100644 (file)
--- a/data/xsl/style.css
+++ b/data/xsl/style.css
@@ -1,5 +1,5 @@
 th.info {
-       background-color       : #99FF99; 
+       background-color        : #99FF99;     
 }
 
 th.key {

diff --git a/data/xsl/xsl.xsl b/data/xsl/xsl.xsl
index 96770eb..bdd79ce 100644 (file)
--- a/data/xsl/xsl.xsl
+++ b/data/xsl/xsl.xsl
@@ -10,12 +10,13 @@
 </xsl:template> 
 
 <xsl:template match="info">
+       <xsl:variable name="path" select="@path"/>
        <tr>
                <th class="info">               
                <xsl:if test="@bookmark = 'true'">
                        <img src="$STAR$" width="16" height="16"/>   
                </xsl:if>
-               <xsl:value-of select="."/> <!-- <img src="{$path}"/> -->
+               <xsl:value-of select="."/>  <img src="{$path}" height="16"/>
                </th>
        </tr>
 </xsl:template>

diff --git a/mdictionary.pro b/mdictionary.pro
index e0fbf59..6dcf823 100644 (file)
--- a/mdictionary.pro
+++ b/mdictionary.pro
@@ -1,11 +1,11 @@
 TEMPLATE = subdirs
-SUBDIRS = src
+SUBDIRS = src tests
 CONFIG += ordered
 include (mdictionary.pri)
 
 
 check.CONFIG += recursive
-check.recurse = src 
+check.recurse = src tests
 QMAKE_EXTRA_TARGETS += check
 
 

diff --git a/src/mdictionary/backbone/Bookmarks.cpp b/src/mdictionary/backbone/Bookmarks.cpp
index c39f868..32a3ab3 100644 (file)
--- a/src/mdictionary/backbone/Bookmarks.cpp
+++ b/src/mdictionary/backbone/Bookmarks.cpp
@@ -139,7 +139,7 @@ QList<Translation*> Bookmarks::searchWordList(QString word) {
 
 
 QStringList Bookmarks::search(QString word, QString dbName) {
-    //checkAndCreateDb();
+    checkAndCreateDb();
     QStringList result;
     QSqlDatabase db = getDbCnx(dbName);
     if(!db.isOpen() && !db.open()) {

diff --git a/src/mdictionary/backbone/ConfigGenerator.cpp b/src/mdictionary/backbone/ConfigGenerator.cpp
index 049d757..4a5f611 100644 (file)
--- a/src/mdictionary/backbone/ConfigGenerator.cpp
+++ b/src/mdictionary/backbone/ConfigGenerator.cpp
@@ -26,6 +26,7 @@
 */
 
 #include "ConfigGenerator.h"
+#include <QDebug>
 
 bool ConfigGenerator::generateCss(QString file) {
     return generateFile(":/xsl/style.css", file);

diff --git a/src/mdictionary/backbone/backbone.cpp b/src/mdictionary/backbone/backbone.cpp
index bdbb11a..f61266e 100644 (file)
--- a/src/mdictionary/backbone/backbone.cpp
+++ b/src/mdictionary/backbone/backbone.cpp
@@ -263,13 +263,11 @@ void Backbone::addInternalDictionary(CommonDictInterface* dict, bool active) {
 
  void Backbone::removeDictionary(CommonDictInterface *dict) {
      _dicts.remove(dict);
-     if(dict)
+     if(dict) {
         dict->clean();
-     else
-        qDebug()<<"delete empty dict";
-     delete dict;
+        delete dict;
+     }
      dictUpdated();
-
  }
 
 

diff --git a/src/mdictionary/gui/MainWindow.cpp b/src/mdictionary/gui/MainWindow.cpp
index 6039f08..16257c6 100644 (file)
--- a/src/mdictionary/gui/MainWindow.cpp
+++ b/src/mdictionary/gui/MainWindow.cpp
@@ -562,7 +562,7 @@ void MainWindow::removeBookmarks() {
     #endif
     if(QMessageBox::question(par, tr("Delete all bookmarks"),
              tr("Do you want to delete all bookmarks? (This action cannot be revoked)"),
-             QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Ok) {
+             QMessageBox::Yes, QMessageBox::Cancel) == QMessageBox::Yes) {
         backbone->removeAllBookmarks();
         if(searchString.size())
             backbone->search(searchString);

diff --git a/src/mdictionary/gui/NotifyManager.cpp b/src/mdictionary/gui/NotifyManager.cpp
index 4bec722..c054f8d 100644 (file)
--- a/src/mdictionary/gui/NotifyManager.cpp
+++ b/src/mdictionary/gui/NotifyManager.cpp
@@ -60,7 +60,6 @@ void NotifyManager::screenChanged() {
 }
 
 void NotifyManager::showNotification(Notify::NotifyType type, QString text) {
-
     if(activeNotifies.contains(text)) {
         return;
     }

diff --git a/src/mdictionary/gui/TranslationWidget.cpp b/src/mdictionary/gui/TranslationWidget.cpp
index ab9f787..935323e 100644 (file)
--- a/src/mdictionary/gui/TranslationWidget.cpp
+++ b/src/mdictionary/gui/TranslationWidget.cpp
@@ -90,8 +90,7 @@ void TranslationWidget::show(QStringList translations) {
     trans = head + trans;
 
     trans+= "</body></html>";
-    trans.replace("$STAR$", "/usr/lib/mdictionary/staron.png");
-
+    trans.replace("$STAR$", "/usr/share/mdictionary/staron.png");
 
     webkit->setHtml(trans, QUrl().fromLocalFile("/"));
 

diff --git a/src/plugins/google/GooglePlugin.cpp b/src/plugins/google/GooglePlugin.cpp
index 2fcd0b5..5a9c13f 100644 (file)
--- a/src/plugins/google/GooglePlugin.cpp
+++ b/src/plugins/google/GooglePlugin.cpp
@@ -430,7 +430,7 @@ QMap<QString, QString> GooglePlugin::initLanguages() {
 void GooglePlugin::getDictionaryInfo() {
     QString fullLangFrom=languages.key(_settings->value("lang_from"));
     QString fullLangTo=languages.key(_settings->value("lang_to"));
-    _infoNote=" [" + fullLangFrom + "-" + fullLangTo + "] (Google)";
+    _infoNote=" [" + fullLangFrom + "-" + fullLangTo + "] ";
 }
 
 

diff --git a/src/plugins/google/TranslationGoogle.cpp b/src/plugins/google/TranslationGoogle.cpp
index fddaa2c..5d1d5c8 100644 (file)
--- a/src/plugins/google/TranslationGoogle.cpp
+++ b/src/plugins/google/TranslationGoogle.cpp
@@ -40,7 +40,7 @@ TranslationGoogle::TranslationGoogle(QString _key,QString _trans,
 }
 
 TranslationGoogle::~TranslationGoogle(){
-    //qDebug()<<"\n\n delete translation:: Google\n\n";
+    ;
 }
 
 
@@ -55,8 +55,8 @@ QString TranslationGoogle::dictionaryInfo() const {
 QString TranslationGoogle::toHtml() const {
     QString result("");
     if(!googlePlugin)
-        return result;
-    result="<dict> <info path=\"\" ";
+        return result;   
+    result="<dict> <info path=\"/usr/share/mdictionary/drawing.png\" ";
     if(isBookmark())
         result+="bookmark=\"true\" >";
     else

diff --git a/src/plugins/google/google.pro b/src/plugins/google/google.pro
index 9f80b38..f867bc1 100644 (file)
--- a/src/plugins/google/google.pro
+++ b/src/plugins/google/google.pro
@@ -24,5 +24,12 @@ TRANSLATIONS += dict_google_pl.ts \
 RESOURCES += \
     icons.qrc
 
+
+unix {
+  INSTALLS += plugin-icon
+
+  plugin-icon.path = $$DATA_DIR
+  plugin-icon.files += drawing.png
+}
 check.commands = echo 'No check here'
 QMAKE_EXTRA_TARGETS += check

diff --git a/src/plugins/xdxf/TranslationXdxf.cpp b/src/plugins/xdxf/TranslationXdxf.cpp
index 0bd9718..7bb8d8d 100644 (file)
--- a/src/plugins/xdxf/TranslationXdxf.cpp
+++ b/src/plugins/xdxf/TranslationXdxf.cpp
@@ -28,7 +28,6 @@
 
 TranslationXdxf::TranslationXdxf():_key(""),_dictionaryInfo("") {
     xdxfPlugin=0;
-//   qDebug()<<"\n\n create translaton Xdxf\n\n";
 }
 
 TranslationXdxf::TranslationXdxf(QString _key, QString _dictionaryInfo,
@@ -37,12 +36,10 @@ TranslationXdxf::TranslationXdxf(QString _key, QString _dictionaryInfo,
     if(xdxfPlugin)
         _dictHash = xdxfPlugin->hash();
     _bookmark=0;
-
-//    qDebug()<<"create translaton Xdxf";
 }
 
 TranslationXdxf::~TranslationXdxf() {
-//    qDebug()<<"delete translation:: Xdxf";
+    ;
 }
 
 QString TranslationXdxf::key() const {

diff --git a/src/plugins/xdxf/xdxf.pro b/src/plugins/xdxf/xdxf.pro
index d108a3c..1fe7ee8 100644 (file)
--- a/src/plugins/xdxf/xdxf.pro
+++ b/src/plugins/xdxf/xdxf.pro
@@ -30,11 +30,14 @@ TRANSLATIONS += dict_xdxf_pl.ts \
                 dict_xdxf_en.ts
     
 unix {
-  INSTALLS += dicts
+  INSTALLS += dicts plugin-icon
 
   dicts.path = $$PLUGINS_DIR
   dicts.files += ../../../data/dicts/eng-us.xdxf
   dicts.files += ../../../data/dicts/eng-thai.xdxf
+
+  plugin-icon.path = $$DATA_DIR
+  plugin-icon.files += xdxf.png
 }
 
 check.commands = echo 'No check here'

diff --git a/src/plugins/xdxf/xdxfplugin.cpp b/src/plugins/xdxf/xdxfplugin.cpp
index 302cb0c..626e300 100644 (file)
--- a/src/plugins/xdxf/xdxfplugin.cpp
+++ b/src/plugins/xdxf/xdxfplugin.cpp
@@ -323,8 +323,9 @@ DictDialog* XdxfPlugin::dictDialog() {
 
 CommonDictInterface* XdxfPlugin::getNew(const Settings *settings) const {
     XdxfPlugin *plugin = new XdxfPlugin();
-    if(settings && plugin->setSettings(settings))
+    if(settings && plugin->setSettings(settings)) {
         return plugin;
+    }
     else {
         delete plugin;
         return 0;
@@ -452,11 +453,10 @@ bool XdxfPlugin::getDictionaryInfo() {
     if(reader.name()=="description")
         _infoNote=reader.readElementText();
 
-    QString format = "png";
-    QString initialPath = QDir::currentPath() + "/xdxf." + format;
+    QString initialPath = "/usr/share/mdictionary/xdxf.png";
 
-    _infoNote="path=\""+initialPath+"\"> \n" + _name + " [" + _langFrom + "-"
-                + _langTo + "] ( xdxf )";
+    _infoNote=" path=\""+initialPath+"\"> \n" + _name + " [" + _langFrom + "-"
+                + _langTo + "]";
     dictionaryFile.close();
     if(okFormat)
         return true;
@@ -518,9 +518,6 @@ bool XdxfPlugin::makeCache(QString) {
     db_name = _settings->value("type") + cachePathN;
     db = QSqlDatabase::addDatabase("QSQLITE",db_name);
 
-    qDebug()<<QSqlDatabase::connectionNames().size();
-    foreach(QString name,QSqlDatabase::connectionNames())
-        qDebug()<<name;
     /*checke errors (File open and db open)*/
     QFile dictionaryFile(dictFileN.filePath());
     if (!QFile::exists(_settings->value("path"))

diff --git a/tests/GooglePluginTests/test.cpp b/tests/GooglePluginTests/test.cpp
index 36492bd..c803afd 100644 (file)
--- a/tests/GooglePluginTests/test.cpp
+++ b/tests/GooglePluginTests/test.cpp
@@ -31,8 +31,8 @@ void GoogleTest::jsonParse() {
     QString test4("");
     QString test5("");
 
-    QCOMPARE(plugin.jsonParse(test1),QString("kot<br/><pos>rzeczownik</pos>:kot, kotka, kociątko, złośliwa kobieta<br/><pos>czasownik</pos>:podnieść"));
-    QCOMPARE(plugin.jsonParse(test2),QString("Go! wyjechać<br/><pos>czasownik</pos>:wyjechać, odchodzić, zgrzeszyć<br/><pos>wykrzyknik</pos>:Odejdź"));
+    QCOMPARE(plugin.jsonParse(test1),QString("kot<br/><pos>rzeczownik</pos>: kot, kotka, kociątko, złośliwa kobieta<br/><pos>czasownik</pos>: podnieść"));
+    QCOMPARE(plugin.jsonParse(test2),QString("Go! wyjechać<br/><pos>czasownik</pos>: wyjechać, odchodzić, zgrzeszyć<br/><pos>wykrzyknik</pos>: Odejdź"));
 }
 
 
@@ -42,7 +42,7 @@ void GoogleTest::getDictionaryInfo() {
     plugin.setLangTo("en");
     plugin.getDictionaryInfo();
 
-    QCOMPARE(plugin.infoNote(),QString(" [Polish-English] (Google)" ));
+    QCOMPARE(plugin.infoNote(),QString(" [Polish-English] " ));
 }
 
 QTEST_MAIN(GoogleTest)

diff --git a/tests/XdxfPluginTests/test.cpp b/tests/XdxfPluginTests/test.cpp
index 7397adc..8cb0a2e 100644 (file)
--- a/tests/XdxfPluginTests/test.cpp
+++ b/tests/XdxfPluginTests/test.cpp
@@ -26,7 +26,7 @@ void XdxfTest::getNew() {
     qDebug()<<"\n";
     XdxfPlugin xdxfPluginB(this);
     Settings *settings=new Settings;
-    settings->setValue("path","../tests/dict.xdxf");
+    settings->setValue("path","../XdxfPluginTests/dict.xdxf");
     CommonDictInterface *xdxfPlugin = xdxfPluginB.getNew(settings);
     delete settings;
 
@@ -42,7 +42,7 @@ void XdxfTest::searchFile() {
     qDebug()<<"\n";
     XdxfPlugin xdxfPluginB(this);
     Settings *settings=new Settings;
-    settings->setValue("path","../tests/dict.xdxf");
+    settings->setValue("path","../XdxfPluginTests/dict.xdxf");
     CommonDictInterface *xdxfPlugin = xdxfPluginB.getNew(settings);
     delete settings;
 
@@ -60,14 +60,14 @@ void XdxfTest::makeCache()
     qDebug()<<"\n";
     XdxfPlugin xdxfPluginB(this);
     Settings *settings=new Settings;
-    settings->setValue("path","../tests/dict.xdxf");
+    settings->setValue("path","../XdxfPluginTests/dict.xdxf");
     settings->setValue("generateCache", "true");
     CommonDictInterface *xdxfPlugin = xdxfPluginB.getNew(settings);
-    delete settings;
 
     QCOMPARE(xdxfPlugin->settings()->value("cached"),tr("true"));
 
     xdxfPlugin->clean();
+    delete settings;
     delete xdxfPlugin;
 
 }
@@ -76,7 +76,7 @@ void XdxfTest::searchCache() {
     qDebug()<<"\n";
     XdxfPlugin xdxfPluginB(this);
     Settings *settings=new Settings;
-    settings->setValue("path","../tests/dict.xdxf");
+    settings->setValue("path","../XdxfPluginTests/dict.xdxf");
     settings->setValue("generateCache", "true");
     CommonDictInterface *xdxfPlugin = xdxfPluginB.getNew(settings);
     delete settings;
@@ -95,7 +95,7 @@ void XdxfTest::searchWordListCache(){
     qDebug()<<"\n";
     XdxfPlugin xdxfPluginB(this);
     Settings *settings=new Settings;
-    settings->setValue("path","../tests/dict.xdxf");
+    settings->setValue("path","../XdxfPluginTests/dict.xdxf");
     settings->setValue("generateCache", "true");
     CommonDictInterface *xdxfPlugin = xdxfPluginB.getNew(settings);
     delete settings;
@@ -142,7 +142,7 @@ void XdxfTest::searchWordListFile() {
     qDebug()<<"\n";
     XdxfPlugin xdxfPluginB(this);
     Settings *settings=new Settings;
-    settings->setValue("path","../tests/dict.xdxf");
+    settings->setValue("path","../XdxfPluginTests/dict.xdxf");
     CommonDictInterface *xdxfPlugin = xdxfPluginB.getNew(settings);
     delete settings;
 
@@ -187,7 +187,7 @@ void XdxfTest::stop() {
     qDebug()<<"\n";
     XdxfPlugin xdxfPluginB(this);
     Settings *settings=new Settings;
-    settings->setValue("path","../tests/dict.xdxf");
+    settings->setValue("path","../XdxfPluginTests/dict.xdxf");
     CommonDictInterface *xdxfPlugin = xdxfPluginB.getNew(settings);
     delete settings;
 
@@ -206,7 +206,7 @@ void XdxfTest::langFrom() {
     qDebug()<<"\n";
     XdxfPlugin xdxfPluginB(this);
     Settings *settings=new Settings;
-    settings->setValue("path","../tests/dict.xdxf");
+    settings->setValue("path","../XdxfPluginTests/dict.xdxf");
     CommonDictInterface *xdxfPlugin = xdxfPluginB.getNew(settings);
     delete settings;
 
@@ -220,7 +220,7 @@ void XdxfTest::timeCache() {
     qDebug()<<"\n";
     QTime timer;
     QDate date;
-    QFile File("../tests/time.xml");
+    QFile File("../XdxfPluginTests/time.xml");
     if(!File.open(QFile::ReadWrite | QFile::Text)) {
         qDebug()<<"Error: could not open file";
         return;
@@ -275,7 +275,7 @@ void XdxfTest::timeFile() {
     qDebug()<<"\n";
     QTime timer;
     QDate date;
-    QFile File("../tests/time.xml");
+    QFile File("../XdxfPluginTests/time.xml");
     if(!File.open(QFile::ReadWrite | QFile::Text)) {
         qDebug()<<"Error: could not open file";
         return;
@@ -325,7 +325,7 @@ void  XdxfTest::timeCacheNormalize() {
     qDebug()<<"\n";
     QTime timer;
     QDate date;
-    QFile File("../tests/time.xml");
+    QFile File("../XdxfPluginTests/time.xml");
     if(!File.open(QFile::ReadWrite | QFile::Text)) {
         qDebug()<<"Error: could not open file";
         return;
@@ -398,7 +398,7 @@ void XdxfTest::timeFileNormalize(){
     qDebug()<<"\n";
     QTime timer;
     QDate date;
-    QFile File("../tests/time.xml");
+    QFile File("../XdxfPluginTests/time.xml");
     if(!File.open(QFile::ReadWrite | QFile::Text)) {
         qDebug()<<"Error: could not open file";
         return;

diff --git a/tests/XdxfPluginTests/test.h b/tests/XdxfPluginTests/test.h
index b713dca..e75db70 100644 (file)
--- a/tests/XdxfPluginTests/test.h
+++ b/tests/XdxfPluginTests/test.h
@@ -37,7 +37,6 @@
  {
      Q_OBJECT
 
-
  private slots:
      void langFrom();
      void getNew();